bitkeeper revision 1.1159.189.1 (41a4d173plGicbSNCc7tOur8hj7XBg)

Merge arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-tmp.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen.bk-smp-public

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/ignore
index 8995729dd818f3a9b78535bb292eaae0a7ae474e,ec7c4e8ee613bbe7ed73fd7fa8747091faecd6ad..9d097f80d5b54534f8dac357653c43ad932e58f8
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -63,8 -59,14 +63,15 @@@ tools/check/.
  tools/libxc/xen/*
  tools/misc/miniterm/miniterm
  tools/misc/xen_cpuperf
 -tools/vnet/vnet-module/.tmp_versions/*
 -tools/vnet/vnet-module/.*.cmd
+ tools/vnet/gc
+ tools/vnet/gc*/*
+ tools/vnet/vnet-module/*.ko
++tools/vnet/vnet-module/.*.cmd
++tools/vnet/vnet-module/.tmp_versions/*
+ tools/vnet/vnet-module/vnet_module.mod.*
+ tools/vnetd/vnetd
  tools/web-shutdown.tap
 +tools/x2d2/minixend
  tools/xentrace/xentrace
  tools/xfrd/xfrd
  xen/arch/x86/asm-offsets.s